hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines

This patch replaces the HAWKBOARD_KICK{0,1}_UNLOCK defines by
DV_SYSCFG_KICK{0,1}_UNLOCK.

The kick register values are not hawkboard specific but may be used
for all davinci boards. In commit f3c149d6c6e5ba8dd72baa86fe527837e4fb0e9a
new defines for these values wer introduced.

Signed-off-by: Christian Riesch <[email protected]>
Cc: Syed Mohammed Khasim <[email protected]>
Cc: Sughosh Ganu <[email protected]>
Cc: Sandeep Paulraj <[email protected]>

diff --git a/arch/arm/include/asm/arch-davinci/davinci_misc.h b/arch/arm/include/asm/arch-davinci/davinci_misc.h
index 211b76920f9c606de69150662cddbf847b31ac02..cbac8031b450d5ddcef1b41dede9fea85ed5420a 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/davinci_misc.h
+++ b/arch/arm/include/asm/arch-davinci/davinci_misc.h
@@ -45,9 +45,6 @@ struct pinmux_resource {
                                .n_pins = ARRAY_SIZE(item) \
                          }
 
-#define HAWKBOARD_KICK0_UNLOCK          0x83e70b13
-#define HAWKBOARD_KICK1_UNLOCK          0x95a4f1e0
-
 struct lpsc_resource {
        const int       lpsc_no;
 };

diff --git a/board/davinci/da8xxevm/hawkboard.c b/board/davinci/da8xxevm/hawkboard.c
index f34830ed2426ac55539ba19f36cf7e3c0f182e71..9d4e238bfc9ae288dbc47c81e37c19ab8ba17897 100644 (file)
--- a/board/davinci/da8xxevm/hawkboard.c
+++ b/board/davinci/da8xxevm/hawkboard.c
@@ -47,8 +47,8 @@ int board_early_init_f(void)
        /*
         * Kick Registers need to be set to allow access to Pin Mux registers
         */
-       writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
-       writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+       writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+       writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
 
        /* set cfgchip3 to select mii */
        writel(readl(&davinci_syscfg_regs->cfgchip3) &

diff --git a/board/davinci/da8xxevm/hawkboard_nand_spl.c b/board/davinci/da8xxevm/hawkboard_nand_spl.c
index e5e65e5fd00a0e68704913b9b0dfabcbd435e915..32b17ce7f4e4fa22a807400e2c54da270671eae2 100644 (file)
--- a/board/davinci/da8xxevm/hawkboard_nand_spl.c
+++ b/board/davinci/da8xxevm/hawkboard_nand_spl.c
@@ -99,8 +99,8 @@ void board_init_f(ulong bootflag)
        /*
         * Kick Registers need to be set to allow access to Pin Mux registers
         */
-       writel(HAWKBOARD_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
-       writel(HAWKBOARD_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
+       writel(DV_SYSCFG_KICK0_UNLOCK, &davinci_syscfg_regs->kick0);
+       writel(DV_SYSCFG_KICK1_UNLOCK, &davinci_syscfg_regs->kick1);
 
        /* setup the SUSPSRC for ARM to control emulation suspend */
        writel(readl(&davinci_syscfg_regs->suspsrc) &